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

[automerger skipped] Fix for heap buffer overflow issue flagged by fuzzer test. am: 569328a9 -s ours am: faa8ee22 -s ours am: e3b366b1 -s ours

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

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



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