Merge "Update OWNERS file." am: 2c630f88 am: 958f15fc am: 34d29bd8 am: a8a54387 am: 7f241d06

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



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