Merge "Update switch status of PrimarySwitchPrefence when disallow by Admin" into tm-dev

packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java

@@ -234,5 +234,10 @@ public class RestrictedPreferenceHelper {
         if (!(mPreference instanceof RestrictedTopLevelPreference)) {
             mPreference.setEnabled(!(mDisabledByAdmin || mDisabledByAppOps));
         }
+
+        if (mPreference instanceof PrimarySwitchPreference) {
+            ((PrimarySwitchPreference) mPreference)
+                    .setSwitchEnabled(!(mDisabledByAdmin || mDisabledByAppOps));
+        }
     }
 }