[automerger skipped] Merge "Split out the nsd API surface and use framework-connectivity-tiramisu" am: f276eba866 am: 828de7c553 am: 199bf1724f -s ours am: 9cedf46327 -s ours

am skip reason: Merged-In I72c7de124b9cc53f2263bd452ecd5f39e88e485b with SHA-1 4f563a4ed5 is already in history

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

Change-Id: I5762f4e5b778fea579b56529728ad4f61070f4df