Merge "Revert "msm: kgsl: Remove wakelock and pm_qos requirements"" into msm-3.0