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

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



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