Merge "Ignore flaky test" into udc-dev am: bd581b088c am: aa678add34

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

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