Merge "Fix for heap buffer overflow issue flagged by fuzzer test." into udc-qpr-dev am: 0c2ffb41

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



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