Merge "LocationManagerService: Fix bug removing proximity alerts."