Merge "Instead of whole test class, just ignore a single test" into udc-dev...

Merge "Instead of whole test class, just ignore a single test" into udc-dev am: b58b4602 am: 61f3b009

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



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