[automerger skipped] Merge "DO NOT MERGE. Fix the cts tests" into android11-tests-dev am: 4fdf378d30 -s ours am: 1df6a936e7 -s ours

am skip reason: subject contains skip directive

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

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