Merge "Cope with KeyMint v2 attestation versions" am: d5f6691d2f am: d8a0116047 am: 3f3c1dc1ea am: ac4704e303

Original change: https://android-review.googlesource.com/c/platform/cts/+/1962501

Change-Id: I54a5f72d9db7d3c52a35be855e0368ea6953d920