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

[automerger skipped] Fix for heap buffer overflow issue flagged by fuzzer test. am: 28dfceb4 -s ours am: 2829a2ac -s ours am: c6a57130 -s ours am: b6f372aa -s ours am: bb9fe865 -s ours am: 36b85339 -s ours

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

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



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