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

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



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