[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 am: 888ec76b -s ours

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

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

Change-Id: Iada8ae94b8f1717b3844e943cb728300b2422a45