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

[automerger skipped] Merge "Fix heap-use-after-free issue flagged by fuzzer test." into sc-v2-dev am: e9463eab -s ours am: beaccbb2 -s ours am: 56ec7712 -s ours am: 56db6ec7 -s ours am: a3c54e20 -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: I712950b6cedec367ad713b342b35eeb12db642ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>