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

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

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