Merge "Rename some variables in NsdService" am: 2388643f92 am: d601de148d am: 4ef52376bd am: 6415e743da

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

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