Merge "Fix VHAL VTS issue on GSI image" into sc-dev am: a8c42cf0 am: 3777c18c am: 31473058

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

Change-Id: Id132325e2a52e9dc0d057855c913e490b3384cde