[automerger skipped] Merge "mp3dec: Changes in the fillMainDataBuf function" into rvc-qpr-dev am: 28a802c5ca -s ours

am skip reason: skipped by user essick

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

Change-Id: I277339a2cf2d386b1a78537ca4fc57df6ffd995f