[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-dev am: 6bf6401b -s ours am: 648cdbba -s ours

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

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



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