Merge "msm: msm-pm: Remove timeout waiting for cpu to power collapse"