[automerger skipped] Update mtp packet buffer am: edf60c63 am: da34e9cc -s...

[automerger skipped] Update mtp packet buffer am: edf60c63 am: da34e9cc -s ours am: 491739be -s ours am: 34d7cb7d -s ours am: a2efa86e -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/+/25444202



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