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

Change-Id: I91e9707f608c99b4c9c76e281caa294ca44c9bb8

Conflicts:
	res/values/custom_strings.xml
	res/xml/carrierlabel.xml
	src/com/android/settings/du/CarrierLabel.java