Merge "msm: bam_dmux: add A2 power collapse support" into msm-3.0