Merge "libstagefright: fix heap use after free issue" into tm-qpr-dev am: 00f1aedf

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



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