Merge "Update the default KeyMint version" am: 7fc756ee1a am: e3e82c9d53

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

Change-Id: Id1f8ab660897f15dc8371ef6859c2464ae426015