Settings: Custom carrier text in notification pulldown 2/2

Conflicts:

	src/com/android/settings/cyanogenmod/SystemSettings.java

Change-Id: I311e052eb8c4661d34e3bc51532a58c29fb97ae0

Conflicts:
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java