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

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



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