Merge "Fix incorrect owners based on feedback during code-review" am:...

Merge "Fix incorrect owners based on feedback during code-review" am: 65081025 am: 18cf0894 am: cdcb3859 am: c92d67d4

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



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