Merge "BatteryService: Allow power supplies to switch type between AC and USB"