Merge "Reject SUPL connection when data is disbaled by user. b/18127920" into lmp-mr1-dev