Merge "Fix VTS Fuzz issue" am: c865dedf am: e67bde23 am: 47c313f6

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



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