Revert "[2/2] Settings: Make menu unlock configurable"

This reverts commit ddce7e5582d75ac13a74562cbde5649621611cf0.

Conflicts:
	res/values/pa_strings.xml
	res/xml/security_settings_chooser.xml
	src/com/android/settings/SecuritySettings.java