Merge "Fix VTS test" into sc-dev am: 083efb0be1

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

Change-Id: I2026b51e701cd8bef4d19f8f2166935a1a237b2c