Merge changes from topic "am-86c0ae89e3c847c8a473d59d272871a3"

* changes:
  Merge changes from topic "am-53723217c4054f878b577ab8985c4313" into android13-tests-dev am: 8464b75fa8 -s ours
  [automerger skipped] Merge "backport group files for media OWNERS references" into android12L-tests-dev am: 21ec01b033 -s ours am: 3e59c53cb5 -s ours