Merge "Update OWNERS" am: e03fbcc4b9 am: da19cdb36e

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

Change-Id: Iaa8362ea7ef500d9073767815bb243412f759d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>