Merge "Don't add stopping apps in relaunch based on stopped flag." into pi-dev

am: ab762775d5

Change-Id: Id3d1d73a691fdfd243315645d5dca552a3cec3b9

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

@@ -2738,11 +2738,6 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
         } else {
             service.mHandler.removeMessages(PAUSE_TIMEOUT_MSG, this);
             setState(PAUSED, "relaunchActivityLocked");
-            // if the app is relaunched when it's stopped, and we're not resuming,
-            // put it back into stopped state.
-            if (stopped) {
-                getStack().addToStopping(this, true /* scheduleIdle */, false /* idleDelayed */);
-            }
         }
 
         configChangeFlags = 0;