Merge "Stop using BaseNetdEventListener in ConnectivityService."