Return: Custom Carrier Label [2/2]

Change-Id: I1965fe6fd6cef7eb0fb78d856db9edf69659573d

Patchset: 4
https://gerrit.slimroms.net/#/c/1851/

Conflicts:
	res/values/pa_strings.xml
	res/xml/additional_settings.xml