Merge "Register the service-to-app callback whenever the service comes up for...

Merge "Register the service-to-app callback whenever the service comes up for BluetoothConnectionCallback. This ensures that if the bluetooth process dies, the callbacks will be re-established once it comes back up." am: 931df242 am: 2f511545

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533089

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic60e9efe84a5009c7fd0112c8ab92cae2973d77c