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

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

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



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