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

Change-Id: I2bbd97293d2887824b857d7e20fdc14d574bc097