am f313b59b: Merge change 1957 into donut

Merge commit 'f313b59b4fd6711c734288badd75c6aa0b57ee6e'

* commit 'f313b59b4fd6711c734288badd75c6aa0b57ee6e':
  Settings: Disable network location service by default, enable GPS instead.