[automerger skipped] Merge "Fix for heap buffer overflow issue flagged by fuzzer test." into sc-dev am: 6bf6401baa -s ours am: 648cdbba2a -s ours am: d5aa7e9b9f -s ours am: deb5bb7247 -s ours am: 1c13c9a0f1 -s ours am: 9238e6af00 -s ours am: b670a77ac4 -s ours am: 4c9fba169e -s ours am: b50d8560f7 -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: I1fe20ae8b8b089979d1dab5dafe61b64049434df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>