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

Change-Id: I1a06dd3b4c2dc51eb0b680f7c7d42910881e1a57
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0