Revert "Fixes 'no ripple effect' issue for screen attention setting"

This reverts commit 20d1da2b62.

Reason for revert: Based on bisection, this is the likely root cause of b/186904496

Bug: 186904496
Change-Id: I0eaa026b52610d7ef4543c32791531971e68f8e6

tests/robotests/src/com/android/settings/display/AdaptiveSleepPreferenceControllerTest.java

@@ -84,7 +84,6 @@ public class AdaptiveSleepPreferenceControllerTest {
                 eq(UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT))).thenReturn(null);
 
         mController = new AdaptiveSleepPreferenceController(mContext, mRestrictionUtils);
-        mController.initializePreference();
         when(mController.isCameraLocked()).thenReturn(false);
     }
 

tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java

@@ -60,6 +60,8 @@ public class ScreenTimeoutSettingsTest {
     private ScreenTimeoutSettings mSettings;
     private Context mContext;
     private ContentResolver mContentResolver;
+
+    @Mock
     private Resources mResources;
 
     @Mock
@@ -83,9 +85,7 @@ public class ScreenTimeoutSettingsTest {
         FakeFeatureFactory.setupForTest();
         mContext = spy(getApplicationContext());
         mSettings = spy(new ScreenTimeoutSettings());
-        mSettings.mContext = mContext;
         mContentResolver = mContext.getContentResolver();
-        mResources = spy(mContext.getResources());
 
         doReturn(TIMEOUT_ENTRIES).when(mResources).getStringArray(R.array.screen_timeout_entries);
         doReturn(TIMEOUT_VALUES).when(mResources).getStringArray(R.array.screen_timeout_entries);