[automerger skipped] Fix for heap buffer overflow issue flagged by fuzzer test. am: 38a83caefc -s ours am: bebad5c1a8 -s ours am: 862a4a94cf -s ours am: 1382db88b8 -s ours am: dad36a845d -s ours am: f45485ede6 -s ours am: 607b428279 -s ours am: a3940304ac -s ours

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

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

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