Merge "Fix an issue that a free memory is accessed" am: 2f0061e207 am: 0f87821502 am: 7ac0613ee4

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

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