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

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

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