[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-qpr1-dev am: 5c3d1d4c -s ours am: c22d0024 -s ours

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

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



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