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

Change-Id: I341cbbfd36b4e849651505c187053115833ca4b0