Merge "msm8974: Update PPID to APID SPMI mapping in device tree" into msm-3.4