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

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

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