Merge "Avoid activity stopped when relaunching it to resumed" into sc-dev am: 09c0654895

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934424

Change-Id: If85a8aa7105e543982bcbed4257ac63340432415

services/core/java/com/android/server/wm/ActivityRecord.java

@@ -8206,6 +8206,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
             setState(PAUSED, "relaunchActivityLocked");
         }
 
+        // The activity may be waiting for stop, but that is no longer appropriate for it.
+        mTaskSupervisor.mStoppingActivities.remove(this);
+
         configChangeFlags = 0;
         deferRelaunchUntilPaused = false;
         preserveWindowOnDeferredRelaunch = false;