Merge "Use public API of Settings.Secure to get/put secure settings"