Merge "Revert "sepolicy: thermal: Move to new gs-common location"" into main