Fix google vts dead lock am: 33a593ab59 am: 18738f2a5c am: f7bd18c7c6 am: 34f7b35c46

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

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