Merge "Use ActivityManagerService global lock in dumpHeap" into sc-dev am: a08dcc7ccb am: 96251c00ca

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

Change-Id: Ifd9e38674978f46dbd9fedd4f6682a6b0514cb38

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

@@ -14831,7 +14831,7 @@ public class ActivityManagerService extends IActivityManager.Stub
                 throw new IllegalArgumentException("null fd");
             }
 
-            synchronized (mProcLock) {
+            synchronized (this) {
                 ProcessRecord proc = findProcessLOSP(process, userId, "dumpHeap");
                 IApplicationThread thread;
                 if (proc == null || (thread = proc.getThread()) == null) {