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

[automerger skipped] Update mtp packet buffer am: d5d10d82 -s ours am: 92034da1 -s ours am: db086891 -s ours am: 9b7bd4c1 -s ours

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

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



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