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

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

Change-Id: I216cd96527efaed4b4b08efe927227debef78246