[automerger skipped] Merge "KeyMint VTS: skip device ID checks on GSI" into tm-dev am: 955b77be57 am: 7b453ff4bc am: 565404dbf2 -s ours am: 980a3ded20 -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: Ie4da22bdf12543b5695378603c480e850cf0bbeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>