Merge "[automerger skipped] Merge "Disable broken test" into oreo-mr1-cts-dev am: 87204785ca -s ours" into pie-cts-dev am: 0145e91566 -s ours am: 193e137bf8 -s ours

am skip reason: Change-Id I847e5ab94aad4ab2f9dcdaf90bd77f3426432153 with SHA-1 85bda36f95 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1583252

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3e349449525924d6cf99b099d65d14fcd0ccb3f