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

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

Change-Id: Idb9e8dcd7c38ee09e21a3e0af3e643c44f9aa357
tree: 41aa756d7e2b91e99704bc22330f89d7c6f0c575
  1. core/
  2. services/