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

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

Change-Id: I869cf37c4e5754e3c5e158c38c6a71b0c3283286