Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev

src/com/android/settings/display/AdaptiveSleepPreferenceController.java

@@ -90,6 +90,7 @@ public class AdaptiveSleepPreferenceController {
         if (enforcedAdmin != null) {
             mPreference.setDisabledByAdmin(enforcedAdmin);
         } else {
+            mPreference.setChecked(isChecked());
             mPreference.setEnabled(hasSufficientPermission(mPackageManager) && !isCameraLocked()
                     && !isPowerSaveMode());
         }

src/com/android/settings/display/ScreenTimeoutSettings.java

@@ -81,6 +81,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
         @Override
         public void onReceive(Context context, Intent intent) {
             mAdaptiveSleepBatterySaverPreferenceController.updateVisibility();
+            mAdaptiveSleepController.updatePreference();
         }
     };