Merge "Re-register callbacks when service is connected" am: ed7a08d1 am:...

Merge "Re-register callbacks when service is connected" am: ed7a08d1 am: 188455b9 am: 7596e40c

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



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