Custom carrier label

PS2: fixed conflicts for now
PS3: update commit message
PS4: Rebase

Change-Id: I86fb90d84709fe6d434b63c9f551b976e870af25

Conflicts:

	res/values/spirit_strings.xml
	src/com/android/settings/cyanogenmod/NotificationDrawer.java

Conflicts:
	res/values/shift_strings.xml
	src/com/android/settings/cyanogenmod/NotificationDrawer.java