Merge "Temporarily reduced owners during refactoring" am: f6e47073

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2184606



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