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

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



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