Merge "BatteryStats: Acquire network stats without BatteryStatsImpl lock" into oc-dev