Merge "Update OWNERS file" am: 0b82c863c8 am: 91e9d9cd1c

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

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