Merge "KeyMint VTS: skip device ID checks on GSI"