Merge "qcom-geni-se: correct the bandwidth aggregation logic"