Merge "Disable broken test" am: 17b8909baf am: 356659ab8c am: 59ef3d52e9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc47821cf109fa65dcb613a33585e159d47874e1