Merge "[automerger skipped] Fix heap-use-after-free issue flagged by fuzzer...

Merge "[automerger skipped] Fix heap-use-after-free issue flagged by fuzzer test. am: 15b46d31 am: a2c38490 am: d1f93f8d -s ours am: a371459e -s ours am: 6baac194 -s ours am: 97ed3497 -s ours am: 424ffdce -s ours am: e83af824 -s ours" into udc-d1-dev-plus-aosp am: c29e079f -s ours am: c220dee9 -s ours

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

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



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