Merge changes from topic "no-battery"

* changes:
  BatteryService: don't set battery low or critical states if no battery
  BatteryStats: Don't collect battery stats if no battery