Merge "Keystore 2.0: Fix convertStorageKeyToEphemenral" into sc-dev am: 7e9dfba159

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/15365713

Change-Id: I7b6732eea3d7601eccce176aad56f717e22f78dc