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

This reverts commit cc984266c6de376447cef5f7eed0e502ce3c7cc8.

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

PS3 : Re-Add removed msim carrier label

Signed-off-by: aways <aways@c-rom.org>

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