Merge "Skip running app pair flicker tests since it's deprecated" into tm-dev am: 535fbd5b am: 694a6ff9 am: cd371642

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



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