Merge "Rename some variables in NsdService" am: 2388643f92

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

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