Merge "KeyMaster 4.0 VTS: fix GSI detection" into sc-dev am: cee75918e2 am: 8c433d1a55

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

Change-Id: Id88c2f8cf52e8c24ce21096fb445427903e65fe3