overlay: cleanup some network options

Change-Id: Id4c4c952941354fe42d946c1762e4039926aa60f
gps: disable qcom network location services for now

[init.svc.xtwifi_inet]: [restarting]

Somehow I've managed to have this broken on two individual devices this week. :(

Change-Id: I9fc42e8a8ea760b4c5ac48f4dad79954fad88d98