Merge "Demote flaky flicker tests" into tm-dev am: 12b486a3 am: a9225ea1

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



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