Merge "[ActivityManager] Prevent kill a restarted process again."

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

@@ -12447,6 +12447,7 @@ public final class ActivityManagerService extends ActivityManagerNative
         app.resetPackageList(mProcessStats);
         app.unlinkDeathRecipient();
         app.makeInactive(mProcessStats);
+        app.waitingToKill = null;
         app.forcingToForeground = null;
         app.foregroundServices = false;
         app.foregroundActivities = false;