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

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

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



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