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

[automerger skipped] Merge "Fix for heap buffer overflow issue flagged by fuzzer test." into sc-qpr1-dev am: 8a9b7cb9 -s ours am: d55ca473 -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: Ib078a1a2bca6824c47e625b89210c0e0dee69846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>