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: Ia698d3b7dfb6fcc36e21d00fc80142b1b97269da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>