Fix google vts dead lock am: 33a593ab am: 18738f2a am: f7bd18c7 am: 34f7b35c am: fcc3b6f0

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



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