Settings: Move LockBeforeUnlock -> Secure (2/2)

not really needed because it does not touch the security system.
But imo better from consistence so I decided to move it.

Also found a duplicate in provider.Settings from first porting
merges

cheers

Change-Id: I849c07d2e54b5cf068e133aa95e9619c9cedceec

Conflicts:
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/slim/LockscreenInterface.java