Settings: Lock before unlock the new way (2/2)

for more information see fb commit please.
target selection if lock before unlock is activated
will be enabled and shows the repective settings dependend
on if it is a phone or tablet

Change-Id: Ie54d3a05278deb832a4939f4f82c222dace598c3

Conflicts:
	res/values/cr_strings.xml
	res/xml/security_settings_password.xml