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

[automerger skipped] Fix for heap buffer overflow issue flagged by fuzzer test. am: 38a83cae -s ours am: bebad5c1 -s ours am: 862a4a94 -s ours

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

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



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