[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: eb075b66c6 -s ours am: 1e1e3c5c3c -s ours am: b0da80826a -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: I34bd1bccaee41461a38cda7f38b96b210d9dd7d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>