Merge "Merge "Update OWNERS file to match master" into android12-tests-dev am:...

Merge "Merge "Update OWNERS file to match master" into android12-tests-dev am: d00bddca" into android12L-tests-dev am: 14f31a2d

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



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