Merge "Consolidate input OWNERS files" am: 467ebb8379 am: 7845f672bf

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

Change-Id: I0316c2bc2f120d9a6534758b49595a36c57f9158
Signed-off-by: Automerger Merge Worker <[email protected]>