Merge "Disable flaky flicker tests" into tm-dev am: 5428fee9 am: 9812c2dc

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



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