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

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

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