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

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

Change-Id: Ic2416b44f3eb35befc9743c3b66ffae03593bdbf