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

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

Change-Id: If4d5f02e1d69c1c770d69a97ab9dc022ca5f394a