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

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

Change-Id: I05b036e9a7b49183e6fe5d8f6bf3698db854dd85