Merge "CsipSetCoordinatorServiceTest: Fix flaky tests caused by call after teardown" into main

android/app/tests/unit/src/com/android/bluetooth/csip/CsipSetCoordinatorServiceTest.java

@@ -406,6 +406,8 @@ public class CsipSetCoordinatorServiceTest {
 
         // Send a connect request
         Assert.assertTrue("Connect expected to succeed", mService.connect(mTestDevice));
+
+        TestUtils.waitForIntent(TIMEOUT_MS, mIntentQueue.get(mTestDevice));
     }
 
     /**
@@ -662,6 +664,8 @@ public class CsipSetCoordinatorServiceTest {
         // add state machines for testing dump()
         mService.connect(mTestDevice);
 
+        TestUtils.waitForIntent(TIMEOUT_MS, mIntentQueue.get(mTestDevice));
+
         mService.dump(new StringBuilder());
     }