Merge "qseecom: Fix failure to go into suspend" into msm-3.0