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

Conflicts:
	AndroidManifest.xml
	res/values/gummy_strings.xml
	res/xml/gummy_interface_settings.xml

        res/values/strings.xml
Change-Id: I8f00bc414d428ad4f197e28d004bbdaa6e83899b

Conflicts:
	src/com/oct/tentacles/SettingsActivity.java