Custom Carrier Label (1/2)

Change-Id: Ib3c804b22b3d718d668305fca5f0062cd0eca919

Conflicts:
	core/java/android/provider/Settings.java

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/keyguard/CarrierText.java