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

[automerger skipped] Update mtp packet buffer am: 55757c29 -s ours am: bfbb7efa -s ours am: ad14bb52 -s ours am: 7ca1d7fd -s ours am: bf232cc8 -s ours am: 60173f70 -s ours

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

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



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