Merge "Update the default KeyMint version" am: 7fc756ee1a am: e3e82c9d53 am: d6ef5852b5 am: 059a030d48 am: f2021d36c4 am: b4a05e31e2

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

Change-Id: I00a265755121ffe346cb85e8a529e1998707400c