Merge "Move f/b/packages/Nsd files to f/b/packages/ConnectivityT" am: 610b585502

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

Change-Id: I9675aa02c8271ecc9d8d11c5cb544f56d8ff1f93