Merge "Makes screen attention unsearchable on the devices that don't have the feature" into sc-dev

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

@@ -87,6 +87,7 @@ public class ScreenTimeoutSettingsTest {
                 com.android.internal.R.bool.config_adaptive_sleep_available);
 
         doReturn(null).when(mContext).getSystemService(DevicePolicyManager.class);
+        doReturn(mResources).when(mContext).getResources();
 
         doReturn(mResources).when(mSettings).getResources();
         doReturn(mContext).when(mSettings).getContext();