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

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

Change-Id: I7c36144cef4b8e880e32e0524b9b976e6f9e9816