Frameworks: Move LockBeforeUnlock -> Secure (1/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: I465d28973e480010bdc4966933e83cf6c0df9990

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