Merge "Ignore flaky test" into tm-dev am: 0d576087 am: 2a012181

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



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