Merge "Remove NsdSettings from test" am: 5c3c3af9b6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908687

Change-Id: Id16806c021858dd1f1abb4e26995677f6ae0561c