[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 -s ours am: 4657d023 -s ours am: e8338926 -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: I46ba50806f6f4e115d2a9582d7c4d46b9f848cb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>