Merge "Use PRIVACY_CONTROLS enum in PrivacyControlsFragment"