Custom Carrier Label (2/2)

Change-Id: Ib9af0419bfcbe9285ecc47770fb0504518d1d344
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

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