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

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

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