Merge "KeyMaster 4.0 VTS: fix GSI detection" into sc-dev am: cee75918e2 am: 5bcae080d4

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

Change-Id: Ie68b06afd1659cef6a174ad0d124b218ad27909d