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

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



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