Merge "Merge NetdServiceMonitor into NetdMonitor."