am 5ef08182: Merge "Reject SUPL connection when data is disbaled by user. b/18127920" into lmp-mr1-dev
automerge: e939996

* commit 'e939996646bd40284a2d3fdd5a8d539e9f6c5f75':
  Reject SUPL connection when data is disbaled by user. b/18127920