Merge "Disable flaky flicker tests" into tm-dev am: 5428fee9 am: 9c918229 am: f2fa5850

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



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