Merge "Let NsdPublisher pass the interface index when a service is resolved." into main am: 631ded17fc am: d6037c0cf6

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

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