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

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

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