Merge "Ignore flaky test" into tm-dev am: 851b2e6a am: 9c1cd2d2

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



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