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

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

Change-Id: I5b9178f8f71ff6f9bcf750982ca4e11f29a94ba4