Merge changes from topic "am-f7c405afee5442ca962863efdc257175" into android12-tests-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE Update R CTS to allow extension version 3" into android11-tests-dev am: 727cf8d842 -s ours
  [automerger skipped] DO NOT MERGE Update R CTS to allow extension version 3 am: e958595841 -s ours