[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 rvc-dev am: 9e02a6e3 -s ours am: 40097760 -s ours am: 1c1c069b -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: I09b55f5ba38df14ec537bf0695338b7768d99908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>