Merge "Reset killedByAm flag at attachApplicationLocked"

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

@@ -6098,6 +6098,7 @@ public final class ActivityManagerService extends ActivityManagerNative
         app.hasShownUi = false;
         app.debugging = false;
         app.cached = false;
+        app.killedByAm = false;
 
         mHandler.removeMessages(PROC_START_TIMEOUT_MSG, app);