Merge "Fix VTS generated test with reusable execution." am: c2f025e250 am: c6d9dfa6df am: 3917606102

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

Change-Id: I963f463ea56fb8880a7cf073ecfc036e98cdf956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>