Merge "Mark the test as flaky, to unblock presubmit." into tm-qpr-dev am: ae9ad2d4

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



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