Merge "mtp_packet_fuzzer: Bug fix" into main am: fd83ca3f93 am: 61074fae63 am: 23ad201c46 am: 9504ca1463 am: 73e38c9fdc

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

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