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

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



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