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

1. android_frameworks_base
2. android_packages_apps_settings

Added option to use two different tokens for encryption and locking.

Based on:

http://review.cyanogenmod.org/#/c/24134/
http://review.cyanogenmod.org/#/c/24135/