Merge "Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev am: f45bc095 am: a83b4cfc" into nyc-mr1-dev-plus-aosp