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

Change-Id: I7e42ea6c56007f6f52fa237eb58adcdb1f5a6800