Merge "msm: pm2: Define a variable to update the power collapse status" into msm-3.0