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

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

Change-Id: I399cc060e448e5ca878fe81714a6b8c60a1bfdc4