[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-dev am: cd40a63f am: f45782b0 -s ours am: 329938e3 -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/+/24303958



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