[automerger skipped] Merge "Disable broken tests in slice framework" into...

[automerger skipped] Merge "Disable broken tests in slice framework" into tm-dev am: ff753be7 am: 5d2b6534 -s ours am: 13403945 -s ours

am skip reason: Merged-In Ibfb45b7ba890f36068ef994730ef4771f20be1cb with SHA-1 30652d1c is already in history

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



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