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

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



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