Settings: 6-bar signal icon style [2/2]

Change-Id: Iabe4d497b6283fb76ab5e2b7ce005075139edecf

Conflicts:
	res/values/slim_strings.xml
	res/xml/status_bar_settings.xml
	src/com/android/settings/slim/StatusBar.java