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

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

Change-Id: I2620382b15040c912815c75bb0d96d91aaaecfa3