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

am skip reason: Merged-In I3eb04552f6cf6c0c68c07abffe751bb4d0669215 with SHA-1 17df73a1b8 is already in history

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

Change-Id: Iaedb188175d289751741e93378c27534591e2bf1
tree: 09cd3e626573911924b345471f1b820894b581b8
  1. core/
  2. services/