(clean cherry-pick from downstream branch) Test: atest NsdManagerTest NsdServiceTest Bug: 191844585 Merged-In: I3cf658498bef5755dcb01127a94fff913b6e6298 Change-Id: I3cf658498bef5755dcb01127a94fff913b6e6298
(clean cherry-pick from downstream branch) Test: atest NsdManagerTest NsdServiceTest Bug: 191844585 Merged-In: I3cf658498bef5755dcb01127a94fff913b6e6298 Change-Id: I3cf658498bef5755dcb01127a94fff913b6e6298