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

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

Change-Id: If012a13ae9780bcb5e1a59cd73acde8f8fceee87