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

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