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

Merge "Merge "Sanitize Uri.toSafeString() some more." into tm-dev am: b6da699d am: 5e40d2ef" into tm-d1-dev-plus-aosp am: 63fa7492

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



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