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

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

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