Merge "Split out the nsd API surface and use framework-connectivity-tiramisu" into sc-v2-dev-plus-aosp