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

Change-Id: I43fec0137a75722d0f7b740cdc447100a9cde238