Merge "Renamed BIND_DATA_SERVICE to BIND_TELEPHONY_DATA_SERVICE"