[automerger skipped] Fix for heap buffer overflow issue flagged by fuzzer...

[automerger skipped] Fix for heap buffer overflow issue flagged by fuzzer test. am: 1401a723 -s ours am: 3326d979 -s ours am: 81443cd4 -s ours am: 21ef0e24 -s ours am: 324a56c2 -s ours am: 60bdda85 -s ours am: 6c6ee9f8 -s ours am: 392ce443 -s ours am: 3604f32e -s ours am: 5cc58c2b -s ours

am skip reason: Merged-In Icd0f2307803a1a35e655bc08d9d4cca5e2b58a9b with SHA-1 f07ce8eb is already in history

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



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