Separate Android Encryption Password from Lockscreen Password

This permits the use of a different (hopefully longer and more complex!) encryption
password, while using a simpler (and easier to type) lockscreen password.

Based on omnirom patch:
Ref: omnirom/android_packages_apps_Settings@78e9a97

Conflicts:
	AndroidManifest.xml