Merge "Owners updates" am: 4ee969e8 am: 8a751696 am: 5644438f

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



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