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

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

Change-Id: Ib1dd303777f18f789762db324803062b5a4bec9a