Merge "More OWNERS refactoring" am: 47b52267d9 am: 16a672628a

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

Change-Id: I0a2b3af7abeee526f7a6663f573a38b7964fede2