msim: Use the SIM operator to label the subscription

network operator is confusing, and downright misleading in roaming
cases

Change-Id: I3f645bbf1191f086ec0b6ca6cc8669915b2902a4
Mms: Scrub debug logging for identifiable information, fix codestyle.

Change-Id: I07e865c9f0b47a9841e7fa2c6a232a1b51d6ad48
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Mms into kk_mkt