Merge "Use ActivityManagerService global lock in dumpHeap" into sc-dev am: a08dcc7c am: 96251c00 am: 9dfd8334

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

Change-Id: I17a6ceb7fc70b93754e8805823d19574bb0b0cfb