Support showing carrier/provider logo on statusbar [2/2]

Change-Id: I91e9707f608c99b4c9c76e281caa294ca44c9bb8

Conflicts:
	res/values/slim_strings.xml
	res/xml/liquid_statusbar_settings.xml
	src/com/android/settings/liquid/StatusBarSettings.java