Add Gesture Lockscreen [2/2]

Change-Id: If5bb620cbc69fc8771e2b6211a2daf78bc50a995

Conflicts:

	src/com/android/settings/SecuritySettings.java

Change-Id: I34aeb1253537fa4dff56bc84735f5d759e4f9a73

Conflicts:

	res/values/cr_strings.xml
	src/com/android/settings/SecuritySettings.java