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

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



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