Merge "mtp_device_fuzzer: Bug Fix" am: 7d7cd6b0 am: 2150a6ae am: d44bc135 am: 3acca984

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



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