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
automatic translation import

Change-Id: I8ac530b79352e122623e1b315dd94876d056d996
Merge remote-tracking branch 'upstream/android-4.4' into android-4.4

Solved conflicts:
	res/values-de/custom_strings.xml