Merge "Reduce acquiring WM lock when ANR happens" into udc-qpr-dev am: 46f899fc am: d91c80d3

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



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