Return: Custom Carrier Label [2/2]

Conflicts:
	res/values/slim_strings.xml
	res/xml/notification_drawer_qs_settings.xml

Change-Id: I1965fe6fd6cef7eb0fb78d856db9edf69659573d