Merge "C2SoftMp3Dec: fix OOB write in output buffer" into qt-dev am: 1b21082920 am: c63899dfc8 am: 62985ff9b8 am: 4b9ea8185c

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

Change-Id: I714956bb1404e721aa9ddf368eabad2f160688d2