Merge "Revert "Adds a new ACCESS_CONTEXT_HUB permission""