Merge "Floss: add corresponding SBC parameters in proto message" into main am: fcf34698

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2688967



Change-Id: If49a8874d881297fa4a09153bc1f8479346cfa4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>