Merge "Upgrade KeyMint version" am: b2f12f933a am: ce0a0909de

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

Change-Id: I03f9011d4d76b02fefec1b45a65ff765cc9e6de6