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

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

Change-Id: I2516a48303cc88069f08cf636bf33a1dccdb4622