Merge "Keystore 2.0: add convertStorageKeyToEphemeral() to IKeymintDevice" am: 38b3bcee7f am: d037d2a2c7 am: ae368b8c17

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1622545

Change-Id: I21ebe3153fd278c3ba9e74f850bd4fe445aa1ee2