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

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



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