Merge "Promote and demote flicker tests" into tm-dev am: e1dbfe84 am: 9d3ac7fd am: 3b78ba36

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



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