Merge "Merge "Prevent race condition" into udc-dev am: 0ab1c83c am:...

Merge "Merge "Prevent race condition" into udc-dev am: 0ab1c83c am: 6bdfe50e am: ffa874a8" into udc-qpr-dev-plus-aosp am: 47652a5d

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



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