Merge "Owners updates" am: 4ee969e8ef am: 8a75169694

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

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