Merge changes from topic "nsd-custom-host" into main am: a90737dc23

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

Change-Id: Ib397df7eeacd4cb066f09c605a524c36ca6fee03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>