Merge changes from topic "broadcast_callback_fixes" am: 407f75ba am: e677ade8 am: bbc55c6b

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



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