Merge "Update OWNERS file." am: 427a447559 am: 733e788185 am: b2a9894c10

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

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