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

[automerger skipped] Update mtp packet buffer am: be9ffd03 -s ours am: 3a3759af -s ours am: df51dea4 -s ours am: 65ffc2e9 -s ours

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

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



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