am d7f4a078: am 48a90091: am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev

* commit 'd7f4a078791c983c89a4ee90b700bd4951627b8e':
  BatteryStats: Prevent BatteryService from blocking