Show carrier label and custom (2/2)

Change-Id: Ida3321c9176e4e786fad96766dab056d8614360d

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java