Merge "Keystore 2.0: Small performance gain" am: 1efb666352

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

Change-Id: I563e754735f030186e7c52bced521f0454c423be