Merge "Moved USER_SETUP_PERSONALIZATION_* values to Settings$Secure."