Merge "Consolidate OWNERS files and add hackz@ and myself" into main am: 5601531dea am: 52f6eae42f

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

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