[automerger skipped] Merge "Revert "Disable failing tests as cause is...

[automerger skipped] Merge "Revert "Disable failing tests as cause is investigated"" into aosp-main-future am: 19f18e0b -s ours

am skip reason: Merged-In Icacfc750c739c638bc06788df84cdc17334c696d with SHA-1 86bed8a2 is already in history. Merged-In was found from reverted change.

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

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



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