Frameworks: Port all carrier label options (1/2)

Conflicts:
	packages/Keyguard/src/com/android/keyguard/CarrierText.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Change-Id: I00776b2df61eb20ce20fbf9e81d29b13cf2f174a
Merge "Frameworks: Port all carrier label options (1/2)" into kk