The world's two biggest economies have agreed in principle a framework for de-escalating trade tensions.