Merge "Revert "mfd: pm8921: Set PMIC PON reset detection time to 3 seconds"" into msm-3.0