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

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

Change-Id: I4ec0c3d0496ba1666da7f7061bf87eddf6828aa1