Merge "Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE." into jb-mr1-dev