MSIM: Replace SUBs with real operator name.

  Add Sim slot number after Operator name
  Remove unused strings

Change-Id: If7947e2bf8bc6ace182a6ab3955afd3573e5017f
code cleanup

Change-Id: I1c8e951b081489419247671a6dd7261b3ca0967f
Merge branch 'cm-11.0' into kk_mkt