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: I42aa37a757ad46d75e94e2794c2ea889eb8d73e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>