Merge "Remove IBatteryStats from ConnectivityService module"