Merge "Updated mtp_fuzzer" am: d5fdf9c39a am: ceda32b8ea am: aee51cc9a0 am: 3cca5ba12c

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2121493

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