Merge "Update OWNERS file" am: d6c3dfb3ff am: 4f5e3b92f7

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

Change-Id: I7b35ae63b0dc993d5fbd7afccb25a87488999401