Remove lockscreen slide delay option (2/2)

Also enable this option for insecure lockscreen:
* Power button instantly locks

Change-Id: Ibf93519637e0c08bad5d2224c3f76c99b0af60f7

Conflicts:
	core/java/android/provider/Settings.java