Merge "Fix heap-use-after-free issue flagged by fuzzer test." into tm-dev am: 84db4223

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



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