Merge "Ignore flaky test" into tm-dev am: 0d576087b3 am: 32fa83f435 am: b236df1dd2

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

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