Merge "Don't cancel PendingIntents unless the stay_stopped flag is on." into main

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

@@ -4418,7 +4418,9 @@ public class ActivityManagerService extends IActivityManager.Stub
                         packageName, null, userId);
         }
-        if (packageName == null || uninstalling || packageStateStopped) {
+        final boolean clearPendingIntentsForStoppedApp = (android.content.pm.Flags.stayStopped()
+                && packageStateStopped);
+        if (packageName == null || uninstalling || clearPendingIntentsForStoppedApp) {
             didSomething |= mPendingIntentController.removePendingIntentsForPackage(
                     packageName, userId, appId, doit);
         }