Merge "Reduce the number of owners." am: 0d52594ce7 am: 04aba689f4

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

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