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

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

Change-Id: Ifb074e7779385b0373120fdc1a6f2c562dd341bc