Merge "Add some top-level OWNERs" am: 8abc52aad7 am: e3c2aae661

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

Change-Id: Ic74e9bef2ab9e438ff5d8c60451aabeec770c69b