MIUI Style carrier text in the statusbar [2/2]

Change-Id: Ic053615e86401972a15053142191d561fd82e89b

Conflicts:
	res/values/custom_strings.xml
	res/xml/additional_settings.xml
	res/xml/battery_style.xml
	res/xml/carrier_label_prefs.xml
	res/xml/carrierlabel.xml
	res/xml/statusbar.xml
	src/com/android/settings/du/CarrierLabel.java