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

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



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