Merge "Remove NsdSettings from test" am: 5c3c3af9b6 am: b8db34b69c

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

Change-Id: I368e5e5cf353911d52d9ddb6288610262f32bd7c