Merge "power: qpnp-charger: fix maximum USB current logic"