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

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

Change-Id: I08a3326f4e37a0d5be241b7d524176cbf6fabff7