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

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



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