Merge "Updated the owners" am: c22f7980 am: d7659e60

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



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