Merge "Remove the DisabledState from NsdService" am: d65740346e

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

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