Merge "Reduce the test flake on NsdManagerTest"