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

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

Change-Id: Icebce991ae467a06e2f6006850126561b2c4ba68