Merge "KeyMint VTS: skip device ID checks on GSI" into tm-dev am: 955b77be57

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

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