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

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



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