Merge "power: smb5: Rearrange USB ICL SW configuration" into msm-4.9