Merge changes from topic "am-2c6f2e5eee534291b4492797cc33fcac" into android12L-tests-dev

* changes:
  Merge changes from topic "am-6ad61588f3234183bf92c50bc2e972bb" into android12-tests-dev am: c678cc5e3d
  [automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier version to 10_R17" into android10-tests-dev am: 297d546507 -s ours am: e165cc8166 -s ours am: 26f4e97552 -s ours