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

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

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



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