[automerge] libstagefright: fix heap use after free issue 2p: 2bddcbdd0c am: 55383b7c49 am: ede04005ea

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

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