Merge "[automerger skipped] Fix heap-use-after-free issue flagged by fuzzer...

Merge "[automerger skipped] Fix heap-use-after-free issue flagged by fuzzer test. am: 15b46d31 am: a2c38490 am: d1f93f8d -s ours am: a371459e -s ours am: 6baac194 -s ours am: 1dd576ce -s ours am: afd8c05c -s ours am: 554e8d19 -s ours am: afa346b6 -s ours" into udc-d1-dev-plus-aosp am: 36a2d2e8 -s ours am: 876ac57d -s ours

am skip reason: Merged-In I41dde165a5eba151c958b81417d9e1065af1b411 with SHA-1 05f6e7b4 is already in history

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



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