Merge "thermal: msm8960_tsens: Fix reading the correct sensor4 address" into msm-3.0