Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo