Merge "Use a random service type for NsdManagerTest"