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

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

Change-Id: I3d2c051770fc22973bca934ef34be85bebaeb45d