Merge "Keystore 2.0: Add keystore2 support to the keystore-engine."