Merge "[MS70] Have BatteryStatsImpl use the public NetworkStats API"