MSIM: Replace SUBs with real operator name.

  Add Sim slot number after Operator name
  Remove unused strings

Change-Id: If7947e2bf8bc6ace182a6ab3955afd3573e5017f
Merge remote-tracking branch 'cm/cm-11.0' into HEAD