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: 9dfcab88

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



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