Merge "KeyMaster 4.0 VTS: fix GSI detection" into sc-dev am: cee75918e2 am: 72c53ebc8f

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

Change-Id: I7ef40b74373ef0710bef8f9e2c1d45a8e9759d3c