Merge "Keystore 2.0: Teach keystore to decrypt generic blobs."