Merge "power: qpnp-charger: do not set trim to 0 on USB DCP removal"