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

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



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