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

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