Merge "Reduce the number of owners." am: 0d52594c am: 04aba689 am:...

Merge "Reduce the number of owners." am: 0d52594c am: 04aba689 am: ae322e66 am: 017a471b am: 3ff149a5

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



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