Merge "C2SoftAacEnc: Fix setting SBR mode" am: df926d0e14 am: 23505a88ba

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

Change-Id: I405aa78e2de442d347ef5825d667e31eb05bef16