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

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

Change-Id: I65f9480bc6692847640a35dace95427d64384d93