Merge "Mark test as flakytest" into tm-qpr-dev am: 8e63a7c8a4

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

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