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

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

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



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