Merge "Align ownership between Connectivity and settings" into main am: 2826098a am: 2da834d4

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



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