Merge "spmi: qpnp-int: Fix bug in setting interrupt type" into msm-3.4