Merge "Updates OWNERS file" am: 35efbedb4f

Original change: https://android-review.googlesource.com/c/platform/build/+/1944687

Change-Id: I531cbf616de14aa699275db1097aa33c7d5afda9