Merge "Add thermal service into system_server"