[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: 73d89318 -s ours am: a640d9b1 -s ours am: d01850a6 -s ours am: 82bebd03 -s ours am: d973b572 -s ours

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

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



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