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

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



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