Merge "Clarified conditions that require client-side unbindService() call." into oc-mr1-dev-plus-aosp