Merge "NsdManager: add test coverage for discoverServices()" am: 3e21b1745c am: 60182dbe4e
am: 27b0eebb4d

Change-Id: I46acfd104ac3457126c3ccef5041788e4146321c
tree: 76a4f43e8f8c64317b0e3494938aea8f4947a13a
  1. core/
  2. services/
  3. wifi/