optional encryption password sync (2/2)

Option to use 2 different tokens for encryption and locking.
Allows convenient usage and strong encryption at the same time.

Inspired by reading next:
https://santoku-linux.com/howto/mobile-forensics/how-to-brute-force-android-encryption

Related discussion:
http://code.google.com/p/android/issues/detail?id=29468

Change-Id: I71a31e7a04b84910d5be317e6f531c41d7ad002f
Signed-off-by: Dan Trifan <jimsth@gmail.com>