Settings: Set untranslatable

Change-Id: I0702378bab455a7ccf95a174e36bc792d26feec8
Fix upgrade to latest proguard

Change-Id: I3fc77adc895e98673005e89bb99a38744f01bb97
msim: Use the SIM operator to label the subscription

network operator is confusing, and downright misleading in roaming
cases

Change-Id: I3f645bbf1191f086ec0b6ca6cc8669915b2902a4
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0-sgt7