Merge "ARM: dts: msm: Change ESR discharging timers for pm660 on sdm670"