Merge "Merge "Prevent race condition" into udc-dev am: 0ab1c83c am: 6bdfe50e am: 6e1142ac" into udc-qpr-dev-plus-aosp am: 170aade2

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



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