Merge "[automerger skipped] Merge "Backport some OWNERS files" into android12-tests-dev am: 469275d8e3 -s ours" into android12L-tests-dev am: 5da78488e2 -s ours am: 340ca6e471 -s ours am: 58690952ff -s ours am: b3e3087884 -s ours

am skip reason: Merged-In I840068aa1ba5ea3b19b855347d45221875b773e9 with SHA-1 4d21ce0db8 is already in history

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

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