Revert "[2/2] Separation of lock and encription password."

This reverts commit cd07de4bef4edb0e61a39c0c0eb0a0982fbdecbd.

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