Merge "BatteryService: Treat USB charging ports and charging accessories as AC"