[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 udc-qpr-dev am: 0c2ffb41 am: 79296eb2 -s ours

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

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



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