Merge "Revert "Update sepolicy to allow ThermalObserver system service"" into cw-e-dev