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 am: dcfb2ae7 am: 2e08275f

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



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