Merge change 21587 into eclair

* changes:
  BatteryService: Remove hard coded power supply names.