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

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

Change-Id: I70f5e24c8ab83c2aea787757ae713a1d99a74fb6