Merge "Removes HIDL references from ContextHubService"