[automerger skipped] Fix heap-use-after-free issue flagged by fuzzer test. am:...

[automerger skipped] Fix heap-use-after-free issue flagged by fuzzer test. am: d0645e1c -s ours am: 99614f0a -s ours am: 604caf04 -s ours am: 1a35ceaa -s ours am: d39561cd -s ours am: 304dc52d -s ours

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

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



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