Merge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2
am: d2181235b9

Change-Id: I7a5202be0e6a6274f3bd11737f30fee0ef947235
tree: 5c00f1dd6de2daef64f8f548b81080c778324e00
  1. core/
  2. services/
  3. wifi/