[automerger skipped] Update mtp packet buffer am: 38852806 am: e9a1078e -s...

[automerger skipped] Update mtp packet buffer am: 38852806 am: e9a1078e -s ours am: 46e84c43 -s ours

am skip reason: Merged-In I98398a9e15962e6d5f08445ee7b17f5d61a3a528 with SHA-1 5c0f99be is already in history

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



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