Merge "Update switch status of PrimarySwitchPrefence when disallow by Admin" into tm-dev am: 6cbe51cb4e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179571

Change-Id: If3fbf09a211ced66f2f0c3367fa1187546c5f95e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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));
+        }
     }
 }