[automerger skipped] Merge "Make NsdService only start the native daemon when...

[automerger skipped] Merge "Make NsdService only start the native daemon when needed and automatically clean it up." into sc-dev am: c85827a9 -s ours am: 32f53dce -s ours am: 90ef72f3 -s ours

am skip reason: Merged-In I3eb04552f6cf6c0c68c07abffe751bb4d0669215 with SHA-1 171d69e3 is already in history

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

Change-Id: I2cf2569e66e1f61d8831e717c6552cdf7bf9f569