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

This reverts commit 3f9ab86c75489d49f6a143c659c587b651ef2673.

Change-Id: I2d3f835c071308c193faf85f80d039d5394ee7ef

Conflicts:
	res/values/strings_aicp.xml
	res/xml/aicp_carrier_label_prefs.xml
	src/com/android/settings/aicp/CarrierLabel.java