Merge "NsdService should set the Inet6Address scope ids" am: 2ea7c09148

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

Change-Id: I73b76c61818313d69ee1b7ba1a0594640503f29e
Signed-off-by: Automerger Merge Worker <[email protected]>