Merge "keystore2: Bump KM import to version 3" am: 3ae21eaa9e am: 5fcd50920e

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

Change-Id: I70e598e161cf1386c4529ea89ca5675246d69b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>