Merge "Fix issue #37470038: API Review: ServiceConnection.onBindingDead()" into oc-dev