Merge "Revert "Fix VTS Fuzz issue"" am: e959d092 am: cfb439b4 am:...

Merge "Revert "Fix VTS Fuzz issue"" am: e959d092 am: cfb439b4 am: b6f1abab am: b2a55b46 am: a0980601

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



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