Merge "msm: camera: icp: Keep AHB vote at SVS" into dev/msm-4.9-camx