[automerger skipped] Fix for heap buffer overflow issue flagged by fuzzer...

[automerger skipped] Fix for heap buffer overflow issue flagged by fuzzer test. am: b3768224 -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: I4a700dc1136e66b587949f9a93c8de744d392a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>