Add gesture based lockscreen security [2/2]

Change-Id: I97feb9c4ee1a23385d7b528f7a90de29f33d35fd

Conflicts:
	res/values/strings.xml
	src/com/android/settings/SecuritySettings.java