[automerger skipped] Merge "Update mtp packet buffer" into rvc-qpr-dev am:...

[automerger skipped] Merge "Update mtp packet buffer" into rvc-qpr-dev am: 4108a60f -s ours am: 282e59f1 -s ours am: 7824939a -s ours

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

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



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