Merge "Replace BaseNetworkObserver with BaseNetdUnsolicitedEventListener"