Snap for 8582016 from 448185538d43ed157ce42e7e525f27845261232d to tm-d1-release

Change-Id: I0ad2e09f4f0f80af56c3563ea3fd6a0e0bc90d03

src/com/android/keychain/KeyChainActivity.java

diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index 26bfc38..54e7d3a 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -546,7 +546,7 @@
         Uri uri = getIntent().getParcelableExtra(KeyChain.EXTRA_URI);
         if (uri != null) {
             String hostMessage = String.format(res.getString(R.string.requesting_server),
-                                               uri.getAuthority());
+                    Uri.encode(uri.getAuthority(), "$,;:@&=+"));
             if (contextMessage == null) {
                 contextMessage = hostMessage;
             } else {