Merge "Introduce NsdManager API for in-place service updates without re-announcement." into main