[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 tm-dev am: c6acd02d am: b3397b9e -s ours am: b141e865 -s ours am: c6084608 -s ours am: ca5b8f51 -s ours am: d01cbb92 -s ours

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

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



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