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: a196bcb7

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



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