[automerger skipped] Merge "Fix heap-use-after-free issue flagged by fuzzer test." into sc-qpr1-dev am: 5c3d1d4cc5 -s ours am: c22d00248f -s ours am: 300b18a3fc -s ours

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

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

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