Merge "Prevent race condition" into udc-dev am: 0ab1c83c am: 6bdfe50e am: 6e1142ac

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



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