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

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



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