[automerger skipped] Update mtp packet buffer am: 16e03f96 -s ours am:...

[automerger skipped] Update mtp packet buffer am: 16e03f96 -s ours am: 66ee1a20 -s ours am: 06634ef2 -s ours am: 73dab97e -s ours

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

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



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