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

Merge "Merge "Prevent race condition" into udc-dev am: 0ab1c83c am: efb90207" into udc-d1-dev-plus-aosp am: d6abb97a

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



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