Lockscreen: Quick unlock (2/2)

Change-Id: I26eddf575dd25e0aa5944d72d627872a06fa535a

Conflicts:
	core/java/android/provider/Settings.java
	packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java