Merge "Promote and demote flicker tests" into tm-dev am: e1dbfe84

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



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