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

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

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