[automerger skipped] Merge "Backport some OWNERS files" into...

[automerger skipped] Merge "Backport some OWNERS files" into android12-tests-dev am: 469275d8 -s ours am: 3437b9ad -s ours

am skip reason: skipped by user essick

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2194957



Change-Id: Ia8e3c56a43d809abb88d5dfd239023533b36c318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>