Merge "Updated the owners" am: c22f7980

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



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