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

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

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