Merge changes from topic "am-657023d4477f4941ace495be3448a5dd" into android12-tests-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE Allow extension version 5" into android11-tests-dev am: 71c212c8a4 -s ours
  [automerger skipped] DO NOT MERGE Allow extension version 5 am: 4755745db9 -s ours