Fix google vts dead lock am: 33a593ab am: 18738f2a am: f7bd18c7 am:...

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

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



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