[automerger skipped] Merge "KeyMint VTS: skip device ID checks on GSI" into tm-dev am: 955b77be57 -s ours am: 4657d02360 -s ours am: e833892644 -s ours am: d68b081b4a -s ours

am skip reason: Merged-In I3182bad5584c35df7b1eeb476dabb39d19fdf12c with SHA-1 555ba00c0f is already in history

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

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