Merge changes from topic "am-0e3dcfa588aa4e4593b4ef4a937e226a" into android12L-tests-dev

* changes:
  Merge changes from topic "am-f7c405afee5442ca962863efdc257175" into android12-tests-dev am: f87d3307c5
  [automerger skipped] Merge "DO NOT MERGE Update R CTS to allow extension version 3" into android11-tests-dev am: 727cf8d842 -s ours am: 75188b1574 -s ours