Lockscreen Blur (2/2)

Conflicts:
	res/values/cr_strings.xml
	res/xml/security_settings_biometric_weak.xml
	res/xml/security_settings_chooser.xml
	res/xml/security_settings_lockscreen.xml
	res/xml/security_settings_password.xml
	res/xml/security_settings_pattern.xml
	res/xml/security_settings_pin.xml
	src/com/android/settings/SecuritySettings.java

Change-Id: Ib91cd93a6cba7eed5ed8bb9059483ec23a7cc396