Settings: Fix carrier/sim slot string logic for msim settings

Change-Id: I1a06dd3b4c2dc51eb0b680f7c7d42910881e1a57
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into android-4.4_new