Merge "mp3dec: Add test for mp3 file with error protection data" am: 80cd5274e9 am: 66e1d22ca8 am: 9374db2ec4 am: be4ad52595

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

Change-Id: I9de09219c8b4cf17f6924d1e8fb786259cae04f3