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

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

Change-Id: I0b2e424022ff77a13af0907b9dbc2723dcf055f9