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

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



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