Merge "Bass: Fix reversed broadcast code" am: a048bc1a am: d4230f73

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



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