Merge "Fix for heap buffer overflow issue flagged by fuzzer test." into rvc-qpr-dev am: 8ff3cc14

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



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