Merge "Update OWNERS file." am: 2c630f8884 am: 958f15fcd0 am: 34d29bd80c

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

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