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

am: fd9f4511d6

* commit 'fd9f4511d6b57e234b818df07ec8ab54632189b0':
  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());
         }
     }