Merge "BatteryService: scheduleUpdate asynchronously"