Merge "Fix unregistering callbacks" am: b6a2beb6 am: c8843804 am:...

Merge "Fix unregistering callbacks" am: b6a2beb6 am: c8843804 am: d1a0905e am: f2f3855b am: 5b005c00 am: f29c19c0

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



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