am f585be7f: Merge change I11ebbfd9 into eclair

Merge commit 'f585be7f373ad7920a7c486f84cc38b86e3572b7' into eclair-plus-aosp

* commit 'f585be7f373ad7920a7c486f84cc38b86e3572b7':
  A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.