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

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

Change-Id: Ie637f8ee8210d8727bdb7db87e3dc88e71e55216