Merge "Fix VHAL VTS issue on GSI image" into sc-dev am: a8c42cf0a1 am: 1f7a65195d

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

Change-Id: Ic544d457c5c471c021b2c8ddf93eade33f1545cb