[automerger skipped] DO NOT MERGE. Fix the cts tests am: 0b6a0dfbfa -s ours

am skip reason: subject contains skip directive

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

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