Merge "Make setPrivacy not a hidden api"