[automerger skipped] Merge "Split out the nsd API surface and use...

[automerger skipped] Merge "Split out the nsd API surface and use framework-connectivity-tiramisu" into sc-v2-dev-plus-aosp am: 5fd5d007 -s ours

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

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

Change-Id: I27faed9c517b2803392b3d797e28d5f819f39e1c