Merge "mdm2: Increase PSHOLD delay to 5ms to avoid 9x15 pmic-8018 lockup" into msm-3.0