[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: aad1b27f -s ours am: 85595158 -s ours am: 45793c4a -s ours am: 1bea6c58 -s ours am: 8fe43237 -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: Ifa77ba69cb07f06c0a38506257e1fa119f034f11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>