[automerger skipped] Merge "mp3dec: Changes in the fillMainDataBuf function" into mainline-prod am: 61f9a7bd -s ours

am skip reason: skipped by user essick

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

Change-Id: I1d042148644f927a5d0866a786da1fda9ebfc9e1