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

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

Change-Id: Idd673ff2140a7ee574f408e94bdaf100918b0fb3