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

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

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