[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 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: I681028613896e3971589eb9f7def9d16e735bee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>