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: e2777d9a am: dab03860 am: 4a7be7d8

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



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