Merge "Update getUidProcessState to consider mPendingStartActivityUids." into tm-dev am: 6d320d5504

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

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

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

@@ -7196,6 +7196,9 @@ public class ActivityManagerService extends IActivityManager.Stub
         }
 
         synchronized (mProcLock) {
+            if (mPendingStartActivityUids.isPendingTopUid(uid)) {
+                return PROCESS_STATE_TOP;
+            }
             return mProcessList.getUidProcStateLOSP(uid);
         }
     }