Settings: LockBeforeUnlock the new way (2/2)

Due that aosp removed the whole LockBeforeUnlock controll (show slider
lockscreen before an unsecure internal lockscreen) we must try to find another way
without touching the security system itself. Long guess sort solution, lmao

here it is, next SlimBean feature

ASS->Interface->Lockscreen->Security

cheers

Patchset:
- correct strings

Change-Id: Iec178ab5ab57ac370e935e7fd4b426e83036d2bf

Conflicts:
	res/values/strings.xml
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/slim/LockscreenInterface.java
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