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

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

Change-Id: Icbb6092d3fbf767164816be636ca7f565e936b28