Merge "Updates OWNERS files" am: 290bd0a9e7 am: 705ae5cc79 am: 982e8b7d3b am: 9e32ff8438

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

Change-Id: I4c69dc3e4af38287f3e541fdcbca20c4215a5d95