Merge "healthd: restructure healthd_mode_charger" into oc-dr1-dev