Merge "Correct OMAPI OWNERS" am: 2046b3f187 am: 7d825375a1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552054

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide1c94afe872365d69f34bd62200e6990b10c585