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

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

Change-Id: Icd336be49a5ce52cfaa09b5dbf85991032c2b67d