Integrate VPN with new keystore and misc fixes.

* Changes
  + Pass intent to keystore when needed and hooks to resume from it.
  + Generate random, unique ID for profile instead of base64 from its
    name.
  + Add VPN to "Wirless controls" description.
  + Add credential storage to "Security & location" description.
  + More hints to set password and unlock dialogs in credential storage
    settings for actions that come from other processes.
  + Sort VPN profiles according to the names.
  + Replace Keystore with CertTool in L2tpIpsecEditor

src/com/android/settings/vpn/L2tpIpsecPskEditor.java

@@ -50,13 +50,6 @@ class L2tpIpsecPskEditor extends L2tpEditor {
                 : validate(mPresharedKey, R.string.vpn_ipsec_presharedkey));
     }
 
-    @Override
-    public void saveSecrets(String originalProfileName) {
-        L2tpIpsecPskProfile profile = (L2tpIpsecPskProfile) getProfile();
-        profile.getPresharedKey();
-        // TODO: fill up the implementation after keystore is available
-    }
-
     private Preference createPresharedKeyPreference(Context c) {
         final L2tpIpsecPskProfile profile = (L2tpIpsecPskProfile) getProfile();
         mPresharedKey = createSecretPreference(c,