Merge "KeyMint VTS: skip device ID checks on GSI" am: 072c0b3ab6 am: d043e8b231

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

Change-Id: I9ecbd80c5a1612ebe27fc47a08407871778d2fd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>