Merge "msm: msm_bus: Fix aggregation of clocks in active-only context" into msm-3.0