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

Change-Id: Ic7f152784761283d413278313a968fd68dd3c76b