Merge "Make NsdService only start the native daemon when needed and...

Merge "Make NsdService only start the native daemon when needed and automatically clean it up." into sc-dev am: c85827a9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14962980

Change-Id: I5ebaac9071d967281b389116235508bb7cea96e9