[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 udc-qpr-dev am: af57c718 am: 0d87b00a -s ours

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

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



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