Fix google vts dead lock am: 33a593ab59 am: 18738f2a5c

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

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