Merge "Updates OWNERS files" am: 9e5a79c435 am: 829f9ce9b6

Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1706910

Change-Id: I44f0c626f1b77fba05ab6a35440d117197a293d5