Merge "Fix VTS Fuzz issue" am: c865dedf53 am: e67bde23cf

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

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