Merge "Add API shim for NsdManager#stopServiceResolution"