Merge "keystore2: km_compat: Strip prefix for importWrappedKey."