Merge "Clean up ex-media team members from OWNERS" into main am: 921e55eb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3003610



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