Merge changes from topic "broadcast_callback_fixes" am: 407f75ba am:...

Merge changes from topic "broadcast_callback_fixes" am: 407f75ba am: e677ade8 am: bbc55c6b am: 9f207d9e am: 6c5cbd24

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



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