Merge changes from topic "am-b7907043ced44db9a6908095a7b4177d" into android13-tests-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier version to 12_R7" into android12L-tests-dev am: 48987c9656 -s ours
  [automerger skipped] DO NOT MERGE: Bump CTS and CTS Verifier version to 12_R7 am: d187fe75a3 -s ours