Merge "Adding owners" am: b1aabec0 am: 49ea4e5d am: 8a311064 am: 6fbfec99

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170



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