Merge "power: pm8921-bms: Fine tune SOC reporting during suspend/resume"