China ends diplomatic freeze with Norway after Nobel row