Merge "Remove settings and resources about CarrierNetworkNotifier"