Revert "Return: Custom Carrier Label [1/2]"

This reverts commit 90aab4278438012b818fdd30211b592c4e0edbfe.

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

Change-Id: Idf949420f6a334c4522732d38916d230413559b3
Show Statusbar Carrier and Custom label [1/2]

    Ported to AOSPA from N5X CM11 Based by @AragaoAnderson

Change-Id: I61a0489a4e890536511d9d16caadc476f63bc24e

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