Merge "CCodecConfig: Remove SBR mode from SDK message when it is set to auto" am: f81e44f2f3 am: a1a3d48f11 am: d5b019d5ca

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

Change-Id: Ide77b3630f9c7db2548bb1d98997d8f3030573df