Merge "Update Settings owners list" am: 1a811a13 am: ae70edc7 am:...

Merge "Update Settings owners list" am: 1a811a13 am: ae70edc7 am: a6cd016e am: 65136fa9 am: 9c86b7c1

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



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