Merge "Move android.settings.PRIVACY_SETTINGS to PrivacySettings."