Merge "Fix the blocking test case issue" into udc-dev am: b2b558b0 am: e7085b85 am: 350ceadf

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



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