Merge "sched/tune: Remove BUG_ON in schedtune_add_cluster_nrg" into msm-4.9