Merge "Revert "msm: camera: icp: Add Power Collapse"" into dev/msm-4.9-camx