Merge "healthd: Add support for HVDCP chargers"