[automerger skipped] Update mtp packet buffer am: a5b76f86 -s ours am:...

[automerger skipped] Update mtp packet buffer am: a5b76f86 -s ours am: 57dd8deb -s ours am: 65587ed4 -s ours

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

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



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