Merge "Split out the nsd API surface and use framework-connectivity-tiramisu"