[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 43c44f872a -s ours am: ecb5b4dd72 -s ours am: 0bd48d7b8b -s ours

am skip reason: Change-Id I48fd15262f3c997823955a9b02e13710e69f0bda with SHA-1 7cff1c1374 is in history

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

Change-Id: I529201d1486ffdb2cb597b1135beba512f64dacd
tree: 7cea4b1c23c5e97b17cd1dd7c4be91139b1f4a0b
  1. tests/