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

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



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