Merge "Moves Adaptive Sleep's settings from Settings.System to Settings.Secure"