Merge "Keystore 2.0: Fix version binding for user generated attestation keys."