Custom Carrier Label (2/2)

Change-Id: Ib9af0419bfcbe9285ecc47770fb0504518d1d344

Conflicts:
	res/values/cm_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Conflicts:
	src/com/android/settings/DisplaySettings.java