Merge "power: qpnp-charger: add VCP workaround"