Merge "Fix potential FD leak with PhantomProcessRecord bookkeeping" into sc-dev am: 5d411d76ea am: 6ff4ca91d9

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

Change-Id: Id058cab5aea7fa667aa898370056592e03d0e817

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

@@ -305,7 +305,7 @@ public final class PhantomProcessList {
             }
             // Somehow our record doesn't match, remove it anyway
             Slog.w(TAG, "Stale " + proc + ", removing");
-            mPhantomProcesses.removeAt(index);
+            onPhantomProcessKilledLocked(proc);
         } else {
             // Is this one of the zombie processes we've known?
             final int idx = mZombiePhantomProcesses.indexOfKey(pid);