Merge "KeyMint VTS: improve ATTESTATION_ID_ tests" am: f46b2d5402

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

Change-Id: I49980853760b8291bbdfa0782cc6aea0b9b28773