Merge "Update OWNERS file" am: 7f8f3fcc33 am: 6011fcc875

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1835393

Change-Id: I9e9c126a3bc54fbeb56bd65e5461acdb744a7db6