Merge "update OWNERS file" am: 4e6ce5ed24 am: 192233dad0 am: 98801e7c4a

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

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