Merge "Keystore 2.0: Add safe crypto wrapper"