Merge "Update OWNERS files" into main am: 6b28a22740 am: 24babf1f82

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

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