Merge "Revert "Fix VTS Fuzz issue"" am: e959d0923d am: cfb439b4eb am: b6f1abab75 am: b2a55b46de am: a098060108 am: 0a4ad64334

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

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