[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: 409518c1 -s ours am: 17e1af1a -s ours am: 86d45ea3 -s ours am: f414021b -s ours am: 937505aa -s ours am: 3d3b96a2 -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: I18dd0d075e4c0a76fe808f0c0a9f8399a13b6514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>