Merge changes from topic "am-935674935a2c49d19def975b3f2a9a9d" into android12L-tests-dev

* changes:
  Merge changes from topic "am-93cf767a4ebb48f18dc35c557c4b83a6" into android12-tests-dev am: b25e91f353
  [automerger skipped] Merge "DO NOT MERGE Update OWNERS for SdkExtensionTests." into android11-tests-dev am: 5efd12c17a -s ours am: ba479ebf83 -s ours