[automerger skipped] Merge "KeyMint VTS: skip device ID checks on GSI" into...

[automerger skipped] Merge "KeyMint VTS: skip device ID checks on GSI" into tm-dev am: 955b77be am: 7b453ff4 -s ours am: b1fe6833 -s ours am: c2a68e05 -s ours

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

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



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