Merge "[SEPolicy] Name GPU service back to "gpu""