Merge changes from topic "am-df0cbdb2cf234ff6a7f107cb2d1b65e7" into main

* changes:
  Merge changes from topic "am-90c8b117841d4be7ae4bd8b8c9068461" into android13-tests-dev am: 1eaceec900
  [automerger skipped] Merge "DO NOT MERGE Allow extension version 9" into android11-tests-dev am: da949a7dd4 -s ours am: ea7feb2e2c -s ours am: afb24c0c1d -s ours am: 068a81bee0 -s ours