[automerger skipped] DO NOT MERGE C2SoftMp3Dec: fix OOB write in output buffer am: c3e2eb5966 -s ours am: 32cbbe70ec -s ours am: 3f5391826e -s ours am: a76bdd745e -s ours am: d87172fdae -s ours am: 3da9c86d46 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/15918944

Change-Id: Ia34b85c89c2e7a83ca00ac83054b01fb43fb1dca