Merge "KeyMint: new version number in attestation" am: 17393cbb40 am: 0a3c90f904

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

Change-Id: I7e648891e8621e2ff13d73ddae3cf50dc93109a9