Merge "BatteryService: support Dock charging"