Merge "Update broadcast audio configuration with stored value" into main am:...

Merge "Update broadcast audio configuration with stored value" into main am: 0dbefb47 am: eda91cc2

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



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