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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1903750

Change-Id: I0f6ee9fdd4ea40362005da9f279afb90818c8523