[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 43c44f872a -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: Ide0f27a33f339b80f8ebde40e1efb1f06e32c641
tree: de973c7fcfb22f505ff7ac6c9e77a96429c0591a
  1. tests/