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

# Via Android (Google) Code Review (1) and Todd Poynor (1)
* commit 'b86d026a7f4108caefa080cf9e0c0b4b5e275a84':
  BatteryService: Allow power supplies to switch type between AC and USB