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

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

Change-Id: I453da617406dc74068f7cba91b6b3d6df1416c25