Merge "NsdManager: add test coverage for discoverServices()"