Merge "Fix heap-use-after-free issue flagged by fuzzer test." into udc-qpr-dev am: af57c718

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



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