fix qs ribbons

Conflicts:

	res/values/slim_strings.xml
	res/xml/quicksettings_tiles_style.xml
	src/com/android/settings/slim/LockscreenInterface.java