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: 0557739d am: 2960927c

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



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