Merge "power: pm8921-charger: Do not update "type" property of usb_psy"