[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: 55d1f763 -s ours am: 469108a8 -s ours am: 77994ab5 -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: Ib73158c0583127d46dc9c58ae27a72b51761bd2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>