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." am: 05081aa3 am: 109327fe am: 83703e20

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

Change-Id: I36da642b0aab6db1d489b6e987050d6ee86c306c