Merge "Ignore flaky test" into tm-dev am: 0d576087 am: 32fa83f4 am: 0828f9cb am: 0e41f460

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



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