Merge "Fixing the owners file" into main am: a7542e03f4

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

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