[automerger skipped] Merge "Fix for heap buffer overflow issue flagged by...

[automerger skipped] Merge "Fix for heap buffer overflow issue flagged by fuzzer test." into rvc-qpr-dev am: 8ff3cc14 am: a157f7f2 am: 74a49268 -s ours am: a9fab0b8 -s ours am: 5c99143d -s ours am: bf84abb4 -s ours am: 0c29c13a -s ours am: 84bd823c -s ours

am skip reason: Merged-In Icd0f2307803a1a35e655bc08d9d4cca5e2b58a9b with SHA-1 28dfceb4 is already in history

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



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