Merge "Acquire proc lock prior to the call into AM service connection holder" into sc-dev am: db4ff9ef89

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

Change-Id: I88438aeea7dfc89b4cad6afa24c8abcd8b1bb798

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

@@ -15656,9 +15656,11 @@ public class ActivityManagerService extends IActivityManager.Stub
             final ActivityServiceConnectionsHolder holder =
                     (ActivityServiceConnectionsHolder) connectionHolder;
             synchronized (ActivityManagerService.this) {
-                holder.forEachConnection(cr -> mServices.removeConnectionLocked(
-                        (ConnectionRecord) cr, null /* skipApp */, holder /* skipAct */,
-                        false /* enqueueOomAdj */));
+                synchronized (mProcLock) {
+                    holder.forEachConnection(cr -> mServices.removeConnectionLocked(
+                            (ConnectionRecord) cr, null /* skipApp */, holder /* skipAct */,
+                            false /* enqueueOomAdj */));
+                }
             }
         }