Merge "Do not kill the server process itself" am: b38b1408dc am: 629a3621d3 am: 590b5a3dad

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

Change-Id: I10e522b0d27e2c2f068c5764df6b849dbd44fd12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -2574,7 +2574,10 @@ public final class ProcessList {
                     + ", " + reason);
             app.setPendingStart(false);
             killProcessQuiet(pid);
-            Process.killProcessGroup(app.uid, app.getPid());
+            final int appPid = app.getPid();
+            if (appPid != 0) {
+                Process.killProcessGroup(app.uid, appPid);
+            }
             noteAppKill(app, ApplicationExitInfo.REASON_OTHER,
                     ApplicationExitInfo.SUBREASON_INVALID_START, reason);
             return false;