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

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



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