Merge "C2SoftFlacDec: add support to receive multiple CSDs" am: 972aa71d37

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

Change-Id: Ib16284fff25ce752fa9ba420bd6e6f08ab445961