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

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



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