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

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

Change-Id: I83b64071c6693bc4a96c7d6d0d87919265fe8438