[automerge] libstagefright: fix heap use after free issue 2p: 2bddcbdd 2p:...

[automerge] libstagefright: fix heap use after free issue 2p: 2bddcbdd 2p: a648552f am: d56cb24c am: 31170156

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



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