Settings: Port all carrier label options (2/2)

Conflicts:
	AndroidManifest.xml
	res/values/gummy_strings.xml
	res/xml/gummy_interface_settings.xml
	src/com/android/settings/util/CMDProcessor.java
	src/com/android/settings/util/Helpers.java