Merge "More OWNERS refactoring" am: 47b52267d9

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

Change-Id: I3296fe5a660b7aec21eeafbc15477ccc5d24fb4f