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

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

Change-Id: I5e46e6479df5384261714c3996748141f972d60a