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

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

Change-Id: Ibcfba12d3bb8e2a2984b9e1fb50ec9be3b9a8504