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

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



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