Merge "power: pm8921-charger: charging time expiry fixes"