Merge "Update OWNER file" am: de002b7c95 am: c9e79696ca am: 20e60ce472

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

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