Merge "Add more OWNERS" am: ab72b30f19

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

Change-Id: I5d15a9bb666379f54b67c4da43448aa2a56044e4