Merge "Make NsdService only start the native daemon when needed and automatically clean it up." am: 05081aa3b0

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

Change-Id: I6caa9933f307118414039b9dd2391939aeb15c0f
tree: f42be0e6bb00db4b1afd9d5131ed60a86940fd6e
  1. core/
  2. services/