[automerger skipped] Merge "Add ConnectivitySettingsManagerTest" into sc-dev am: a244f13f21 -s ours

am skip reason: Merged-In I8161c1bca84b41964578d59ee5d6ab07b2380707 with SHA-1 236a992cd0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15079711

Change-Id: If47c9a142319af5bb80362795ddd684faff35dff