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

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

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