Revert "[2/2] Settings: Lockscreen Setttings"

This reverts commit 75dc6a7ab4408ae1262dad115b45cf6c0fef4fd6.

Conflicts:
	res/values-zh-rCN/custom_strings.xml
	res/values/custom_strings.xml
	src/com/android/settings/SecuritySettings.java