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

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

Change-Id: I21ea9da82c1921f64b88f1b505c3a3cdbb8c4288