Merge changes from topic "am-ee5a2a9ae5ab402c9cc44537e62a1611"
* changes:
[automerger skipped] Merge "backport group files for media OWNERS references" into android12L-tests-dev am: 21ec01b0 -s ours
[automerger skipped] backport group files for media OWNERS references am: 6302012d -s ours