Merge "Keystore 2.0: add convertStorageKeyToEphemeral() to IKeymintDevice"