Merge "Merge "C2SoftMp3Dec: fix OOB write in output buffer" into qt-dev am: 1b210829 am: c63899df am: 62985ff9 am: 4b9ea818 am: ab2f063f am: 05b467c7" into sc-qpr1-dev-plus-aosp am: b1b2b3b1

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

Change-Id: Ibbdeb4201193502b89f06ee82ce4a1be2ddf29c3