Merge "Update Settings owners list" am: 1a811a130a am: ae70edc7f5

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

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