[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-dev am: 67877620 am: c3f5e16b am: d9f1ddde -s ours am: 4e797d6e -s ours

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

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



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