Add missing gesture unlock stuff

Conflicts:

	core/java/android/provider/Settings.java
	core/java/com/android/internal/widget/LockPatternUtils.java