Merge "Track keystore password method changes" into mnc-dev

src/com/android/settings/CredentialStorage.java

@@ -457,7 +457,7 @@ public final class CredentialStorage extends Activity {
                 String password = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
                 if (!TextUtils.isEmpty(password)) {
                     // success
-                    mKeyStore.password(password);
+                    mKeyStore.unlock(password);
                     // return to onResume
                     return;
                 }

tests/src/com/android/settings/vpn2/CertInstallerHelper.java

@@ -71,7 +71,7 @@ public class CertInstallerHelper {
      */
     public CertInstallerHelper() {
         mKeyStore.reset();
-        mKeyStore.password(CERT_STORE_PASSWORD);
+        mKeyStore.onUserPasswordChanged(CERT_STORE_PASSWORD);
     }
 
     private void extractCertificate(String certFile, String password) {