GMaps hack: NetworkLocationService > GoogleLocationService

- a recent Google Maps update changed the name of the service,
  so we have to follow the change

Change-Id: Ia32fe51e90a1d32c2e942fbf126162a614a69df0

Conflicts:

	services/java/com/android/server/am/ActivityManagerService.java