[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-qpr-dev am: df84d18f -s ours am: 34d80256 -s ours

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

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



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