[automerger skipped] Fix heap-use-after-free issue flagged by fuzzer test. am: e376b3dd40 -s ours am: 04f5f72c01 -s ours am: 996f568eeb -s ours am: 8db2fe5d29 -s ours am: c41dd63bf2 -s ours am: 26d355af63 -s ours am: 046465ca9f -s ours am: 9d47a0eafd -s ours

am skip reason: Merged-In I41dde165a5eba151c958b81417d9e1065af1b411 with SHA-1 7ff382cbc3 is already in history

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

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