Revert "Frameworks: fix carrier display when custom label changes"

This reverts commit 764f120e4bc1ae90350b2f6a6d7e0cdb48a0cdf9.
Revert "Frameworks: add carrier label display in status bar"

This reverts commit b691cb0a42e5d61c955e55313efbf5a4579c6004.
SystemUI: add show carrier label option (1/2)

Change-Id: I600ea04c7384dfd88a7c76a403754b35a9bd369b

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java