Merge "C2SoftMp3Dec: Fix potential null reference in onStop()" into main am:...

Merge "C2SoftMp3Dec: Fix potential null reference in onStop()" into main am: fd379441 am: 61d3c566

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



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