Merge "Update OWNERS" am: 33082d4490 am: f3670cc3d3 am: ee81b81b29 am: cc0bbcb8d7

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

Change-Id: I7ffd1a41f002ba7aae634d1ff96bd6c3c7d81c57