Merge "Update OWNERS file" am: 7c46ad5d1b

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

Change-Id: I953f1327bb7a63c2f44b5af90b3e134ae83a667b