Merge "Have BatteryStatsImpl use the public NetworkStats API"