Merge "Move NsdServiceInfoTest to common tests" am: f51a0139a2 am: a21c10ccc3 am: b0cd731f7f

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

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