Merge "healthd: restructure healthd_mode_charger"