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

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

Change-Id: I9eb1cea7ff6e5e73b866444e3c8e10e64de0aa2d