[automerger skipped] KeyMaster 4.0 VTS: fix GSI detection am: 13cddcb2 am:...

[automerger skipped] KeyMaster 4.0 VTS: fix GSI detection am: 13cddcb2 am: abdb9afb -s ours am: 3672f429 -s ours

am skip reason: Merged-In If3c7d84a9e091b9b0842e4d8919453600bc239ea with SHA-1 1c93999d is already in history

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

Change-Id: I7f05c2709865b06a869ef443d1a39d3184e0bae1