Merge "Add owners to ThermalManagerServiceTest"