[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 tm-dev am: 84db4223 am: cf0afdba -s ours am: 62836e20 -s ours

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

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



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