Merge "Consolidate input OWNERS files" am: 6442a2723c am: 43847ac9d6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2021055

Change-Id: I6301a992d1eca8f995bdacd5f66422ed7be9266d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>