Merge "power: qpnp-charger: enable vtrkl comparator and disable trickle clamp"