Merge "Update OWNERS file to match master" am: 3053faae3d

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

Change-Id: I2bee39fad63bbb38811d665e99f5ffd1f8bac003