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

fix icon size, thanks @alex cruz
allow show/hide logo
fix remove option if device wifi only

Change-Id: I6b8ced20f702885c7df34c9e15103ce1ba08c7e6

Conflicts:
	res/values/custom_strings.xml
	res/xml/bars_settings.xml
	src/com/android/settings/paranoid/StatusBarSettings.java