Merge "Rename connected/disconnected callbacks to conform API guidelines" am: 4d8f714062 am: 31de1aa599

Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1688591

Change-Id: I389f3b4bff2dc690e51c333a636dbf755b3750e8