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

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

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