Merge "KeyMint VTS: improve ATTESTATION_ID_ tests" am: f46b2d5402 am: 0ce446e730 am: c39a694e01 am: 3867a0d821

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

Change-Id: Ibf12c8be33f151c315e70e55cd0c9d10fc025e0c