[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: 59ff8663 am: 95a65d88 -s ours am: 45e58bb5 -s ours

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

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



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