Merge changes from topic "am-dfb5c3200ca64278a1aa1cad5bd285c3" into android12L-tests-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier version to 12_R9" into android12-tests-dev am: b6e2bb8d71 -s ours
  [automerger skipped] DO NOT MERGE: Bump CTS and CTS Verifier version to 12_R9 am: 12e94265ee -s ours