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

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

Change-Id: I667fba98f44d4f2b6d8e7d7487c83fd83e78e2a9