Merge "Disable clear credential option when disallowed by admin." into nyc-dev am: fd9f4511d6

am: 77e360d098

* commit '77e360d098e3d4c3e3098db37770dd6c61e4b0ff':
  Disable clear credential option when disallowed by admin.

src/com/android/settings/SecuritySettings.java

@@ -513,7 +513,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
                     Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
         }
 
-        if (mResetCredentials != null) {
+        if (mResetCredentials != null && !mResetCredentials.isDisabledByAdmin()) {
             mResetCredentials.setEnabled(!mKeyStore.isEmpty());
         }
     }