Custom carrier text (2/2)
same as the other commit

Change-Id: I34e8de1921dce740454101020a1f259cb89f02e2

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