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

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

Change-Id: I625c6fa0c867ec21418407b7013ee1f8e17f7986