[automerger skipped] Merge "Disable failing tests and revisit after holidays"...

[automerger skipped] Merge "Disable failing tests and revisit after holidays" into aosp-main-future am: b7986e07 -s ours

am skip reason: Merged-In Ia79c3a4c487b3cbb3335b386630baefa8d661a64 with SHA-1 3065c363 is already in history

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



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