Merge "thermal: Remove SOFT_OCP related tzones" into main