Merge "Keystore 2.0: Implement convertStorageKeyToEphemeral() in AndroidKeyMintDevice" am: ed1ece62e3 am: c794beeaac

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1622926

Change-Id: I8094ace8c021da125eac6ceb82d94df3913c63ad