[automerger skipped] Update mtp packet buffer am: 960d83c6 am: df4e0d8a -s...

[automerger skipped] Update mtp packet buffer am: 960d83c6 am: df4e0d8a -s ours am: d82e788a -s ours am: 690c3a6e -s ours

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

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



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