Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" into sc-dev