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: Ia51b96f7d1171730ff7f84afd26f22e09a3f05d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>