Merge "Exclude flaky annoatated tests" into tm-qpr-dev am: bc5c8950 am: d1d32615

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



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