Merge "Revert "mp3dec: Fix out of bound read error"" into rvc-qpr-dev am: 0cf52d3be9 am: eb4b3bbe29

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

Change-Id: I6f4e6c15f8f7c2ce230ce04dcc12d1873d1ecd57