Merge "Sanitize Uri.toSafeString() some more." into tm-dev am: b6da699d30 am: 3fd4083940 am: e4b05a453a am: f55e0fb3d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282431 Change-Id: I52dd490a0cfdd30179aeb17c6bc2788f80626081 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: