Gesture Lockscreen [2/2]

Change-Id: If5bb620cbc69fc8771e2b6211a2daf78bc50a995

Conflicts:
	res/values/liquid_integers.xml
	res/values/liquid_strings.xml
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/SecuritySettings.java

Conflicts:
	res/values/liquid_strings.xml

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