Merge "Updates OWNERS files" am: 290bd0a9e7 am: 705ae5cc79

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1707026

Change-Id: Ia80d635e994126c499efb97473d28c509aa245fa