Merge "Fix the problem that when the MainSwitchPreference is gone, there will be a blank area." into sc-dev am: 371f699681 am: 1db13f7a60

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173151

Change-Id: Ib6efd95a638af34be93b0e9f7bb97a74a2642456

tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java

@@ -76,6 +76,7 @@ public class SettingsMainSwitchPreferenceTest {
         mPreference.onBindViewHolder(mHolder);
 
         assertThat(mPreference.isShowing()).isTrue();
+        assertThat(mPreference.isVisible()).isTrue();
     }
 
     @Test
@@ -85,5 +86,6 @@ public class SettingsMainSwitchPreferenceTest {
         mPreference.onBindViewHolder(mHolder);
 
         assertThat(mPreference.isShowing()).isFalse();
+        assertThat(mPreference.isVisible()).isFalse();
     }
 }