Merge "Remove DefaultState in NsdService" into main am: a6307ea9f1

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

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