Revert "underp PhoneStatusBar"

This reverts commit 4e8abef891beb9f9b0696308c6488d7f05c246a2.

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Revert "Frameworks: Port all carrier label options (1/2)"

This reverts commit df1386fada193aa681929092761d71a47aef8822.

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