[automerger skipped] Fix heap-use-after-free issue flagged by fuzzer test. am:...

[automerger skipped] Fix heap-use-after-free issue flagged by fuzzer test. am: 05f6e7b4 -s ours am: 35192571 -s ours am: 051acf4d -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/+/24303957



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