[automerger skipped] Encode authority part of uri before showing in UI am: 8550c37c18 am: 4bc54545ff am: bc8df147ea am: aa977a205d am: 3ccf26dc87 am: ce6f506a5e am: 88f6ff5d47 -s ours am skip reason: Merged-In Ib4f5431bd80b7f4c72c4414f98d99eeb7ca900ed with SHA-1 890dc03ed2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/18281033 Change-Id: I7890f75d9f965a476e9f5695ba997784b0c0f03b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>