Merge "Update OWNERS" am: 8e2fbf6665 am: 588d9b1c07

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

Change-Id: I92ce762ac562acd9c2c6c420761111f6ae14ce0f