TeleService: Refactor sim name / sim label logic

Change-Id: I63a0a2f4d03b91289354cd9d6b51495cd622f760
Merge remote-tracking branch 'cyanogen/cm-11.0' into cm-11.0