Fix google vts dead lock am: 33a593ab am: 18738f2a am: f7bd18c7 am: 34f7b35c am: fcc3b6f0 am: 7bbdbe8f am: 9a2caf77

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



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