Merge "Keystore 2.0: KeyMint returns empty blobs on update"