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

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

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