Gesture Lockscreen [2/2]

Conflicts:
	src/com/android/settings/SecuritySettings.java

Change-Id: Icbfcb847e4fc8f42c20eaae88671b52eecc92bfe