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

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



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