Merge "Fix deadlock caused by wrong locking order" into udc-dev am: cbde6a8f am: 3cfa4ec8

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



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