Merge "power: pm8921-charger: BTC override fixes"