Revert "Separate Android Encryption Password from Lockscreen Password"

This reverts commit 3759063ac99a3dc37b23eb3c015ff6effc87a97b.

Conflicts:
	res/values/mintkat_strings.xml