BatteryService: Fix build

Removed code that was left behind after cherry-pick