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

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



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