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

Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d20574 am: 44146317 am: fa868058

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

Change-Id: Iaa332e9fd56f842a33bf631b889492b4abd9d50d