Android S Beta 3
Merge "Rename connected/disconnected callbacks to conform API guidelines" am: 4d8f714062

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

Change-Id: I8fe192f6eabbc8ea46a028368f5630a63d3651a5