Merge "Sanitize Uri.toSafeString() some more." into tm-dev am: b6da699d30 am: 5e40d2efd9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282431

Change-Id: Iccbff8b172f4e857c65458db333a58f6f769fc16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>