Merge "Move system_server policy to private"