Merge "Merge "Add Adaptive Connectivity switch on/off string for fixing string...

Merge "Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d20574 am: 59c5b189" into sc-v2-dev-plus-aosp am: d4005a11

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

Change-Id: Iff332afabd8ff04d7e2cd027c56062f2df43c225