gps: LocationManager CTS proximity test fix

CTS proximity tests needs to use
GeoFenceManager for GeoFences to be
able to see mock locations

Change-Id: I7696ac4f0985fe526f1eb2dacd177b4db3c658ae
CRs-Fixed: 452172

Conflicts:
	services/core/java/com/android/server/LocationManagerService.java
Revert "gps: LocationManager CTS proximity test fix"

This reverts commit ba06182f7bfc0a51fcd9b2c1292a73ead286354f.