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

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



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