Merge "Wait before asserts activity's removal" into android13-tests-dev

Author: Louis Chang

tests/framework/base/windowmanager/src/android/server/wm/lifecycle/ActivityStarterTests.java

@@ -684,9 +684,8 @@ public void testActivityWithFinishOnTaskLaunch() {
                 .execute();
         mWmState.waitForActivityState(STANDARD_ACTIVITY, STATE_RESUMED);
 
-        // Make sure the activity is finished.
-        assertEquals("Instance of the activity in its task must be cleared", 0,
-                mWmState.getActivityCountInTask(taskId, FINISH_ON_TASK_LAUNCH_ACTIVITY));
+        // Make sure the activity is removed.
+        mWmState.waitAndAssertActivityRemoved(FINISH_ON_TASK_LAUNCH_ACTIVITY);
     }
 
     @Test