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

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

Change-Id: Id4472a8fd474bb9745dc54d07e2443316536f371