Merge "Ignore flaky test" into udc-dev am: bd581b08 am: df5a482d am: 4113fcb9

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



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