Merge "Update OWNERS" am: 33082d4490

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

Change-Id: Ia358e7f028c9fbbb80aa03e714f652c251a6fd9b