Merge "Fix for heap buffer overflow issue flagged by fuzzer test." into tm-dev am: c6acd02d

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



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