Merge "msm: bam_dmux: Update UL wakeup timeout to two seconds"