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

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

Change-Id: I1ef087238cbe33ef654878abb3b29186f04cdf42