Merge "Add owners to ThermalManagerService mocking tests"