Merge "power: pm8921-charger: use trickle time for trickle charging" into msm-3.0