Merge "Upgrade KeyMint version" am: b2f12f933a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1988166

Change-Id: Ic3f772f99448cf501d97c2ef84a9051668fabf26