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

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

Change-Id: Ib198e5da1bf7d15ad481de2048e77734991b96d8