Merge "Update OWNERS files" am: 3e408369ff am: 00e0bf8fca

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d7ce42e8cfba7d09fa4c757e4c4c8a6ee61fdae