[automerger skipped] Update mtp packet buffer am: edf60c6324 am: da34e9cc78 -s ours am: 491739bea0 -s ours am: 34d7cb7d1b -s ours

am skip reason: Merged-In I98398a9e15962e6d5f08445ee7b17f5d61a3a528 with SHA-1 55757c291a is already in history

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

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