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