Merge "msm: thermal: Refactor core control mitigation only for smp"