[automerger skipped] Update mtp packet buffer am: 960d83c6 am: b022a8a3 -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: I3f1b90788ef3519669a4cfca4ffbbf075cba676c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>