Merge "Change KeyMint attestation version to 100" am: 33a10f6d55 am: 40fbaa12aa

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1674705

Change-Id: I84e5e72f3236882435d3b787e55d6a4f3279da56