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

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