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

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



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