Merge "Update OWNERS file" am: 7c46ad5d1b am: c736a6f03a

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

Change-Id: I896574c0c4feb16d77a43fda6b9f639723baba6e