Merge "C2SoftMp3Dec: fix OOB write in output buffer" into qt-dev am: 1b21082920

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

Change-Id: I0486884d67045ec6941a73517ffb94fe22bdb0a5