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

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

Change-Id: Iae6483bd6c0437c0e494e0071f93ebafe4bac8b4