Merge "Remove unused methods from LocationManagerService"