[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 tm-qpr-dev am: 85b3fb45 -s ours am: cd85d7b3 -s ours

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

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



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