Merge "qcom: smblib: Show correct charging status" into msm-4.9