Lockscreen Blur (2/2)

Conflicts:
	src/com/android/settings/SecuritySettings.java
Fix build
One more fix
Fix FC on security -> screen lock selection

https://github.com/temasek/android_packages_apps_Settings/commit/6dbb5fff70ad0faf532e77e4db6e9e19c713f7fc