Revert "ANDROID: allow using network as a location provider"
am: b83b0f1f72

Change-Id: I40eb438cbd574fb20a949136bb427c62aef439f5