Merge changes from topic "am-e4a6bb04d1754d4d9807a9904eecf5fd"

* changes:
  Merge "[automerger skipped] Merge "Backport some OWNERS files" into android12-tests-dev am: 469275d8e3 -s ours" into android12L-tests-dev am: 5da78488e2 -s ours
  [automerger skipped] Merge "Backport some OWNERS files" into android12-tests-dev am: 469275d8e3 -s ours am: 3437b9ada9 -s ours