[2/2] OmniGears: Custom carrier label

Base: https://gerrit.omnirom.org/#/c/5220/

Change-Id: If22cef7b76b346dde4e4a7520d941a378b638def

Conflicts:
	res/values/custom_strings.xml
	res/xml/notification_panel_settings.xml
	src/org/omnirom/omnigears/interfacesettings/NotificationPanelSettings.java