Merge "Revert "msm: camera: HW CDM reset failure workaround"" into dev/msm-4.9-camx