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

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

Change-Id: If45ae869862bbe45350b3297d8fbd58386b5169a