[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-dev am: 85dc16dd -s ours am: 44def9fd -s ours am: 8eb17a5a -s ours am: 468db685 -s ours am: a737f576 -s ours am: 6af58196 -s ours am: cc41b2bb -s ours am: 3be9e76d -s ours am: fd8109e9 -s ours

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

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



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