Merge "Add more OWNERS" am: ab72b30f19 am: 55b8b87199

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

Change-Id: Iec6425d4e2c65d29ea18daa05c46117774533f0d