[automerger skipped] Merge "Merge "Fix deadlock caused by wrong locking order"...

[automerger skipped] Merge "Merge "Fix deadlock caused by wrong locking order" into udc-dev am: cbde6a8f am: c1751cda am: fb3d692c" into udc-qpr-dev-plus-aosp am: a21b78ab -s ours

am skip reason: Merged-In Id9c9fe4bd78d23dff92bf3a32c6f16d8e7b96720 with SHA-1 746c0742 is already in history

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



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