Fix google vts dead lock am: 33a593ab59

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

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