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